Skip to content

Commit 8a3b573

Browse files
geoffromergeoffromer
committed
Merge pull request google#118 from herrniemand/gh-pages
Replaced HTTP where HTTPS was available
2 parents 8c09ccf + b545d7f commit 8a3b573

21 files changed

+159
-159
lines changed

Diff for: ‎README.md

+14-14
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,22 @@ rules, it also contains advice on designing your own vs. adapting an existing
2626
format, on XML instance document formatting, and on elements vs. attributes.
2727

2828
These style guides are licensed under the CC-By 3.0 License, which encourages
29-
you to share these documents. See http://creativecommons.org/licenses/by/3.0/
29+
you to share these documents. See [https://creativecommons.org/licenses/by/3.0/](https://creativecommons.org/licenses/by/3.0/)
3030
for more details.
3131

32-
<a rel="license" href="http://creativecommons.org/licenses/by/3.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/3.0/88x31.png" /></a>
32+
<a rel="license" href="https://creativecommons.org/licenses/by/3.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/3.0/88x31.png" /></a>
3333

34-
[cpp]: http://google.github.io/styleguide/cppguide.html
35-
[objc]: http://google.github.io/styleguide/objcguide.xml
36-
[java]: http://google.github.io/styleguide/javaguide.html
37-
[py]: http://google.github.io/styleguide/pyguide.html
38-
[r]: http://google.github.io/styleguide/Rguide.xml
39-
[sh]: http://google.github.io/styleguide/shell.xml
40-
[htmlcss]: http://google.github.io/styleguide/htmlcssguide.xml
41-
[js]: http://google.github.io/styleguide/javascriptguide.xml
42-
[angular]: http://google.github.io/styleguide/angularjs-google-style.html
43-
[cl]: http://google.github.io/styleguide/lispguide.xml
44-
[vim]: http://google.github.io/styleguide/vimscriptguide.xml
34+
[cpp]: https://google.github.io/styleguide/cppguide.html
35+
[objc]: https://google.github.io/styleguide/objcguide.xml
36+
[java]: https://google.github.io/styleguide/javaguide.html
37+
[py]: https://google.github.io/styleguide/pyguide.html
38+
[r]: https://google.github.io/styleguide/Rguide.xml
39+
[sh]: https://google.github.io/styleguide/shell.xml
40+
[htmlcss]: https://google.github.io/styleguide/htmlcssguide.xml
41+
[js]: https://google.github.io/styleguide/javascriptguide.xml
42+
[angular]: https://google.github.io/styleguide/angularjs-google-style.html
43+
[cl]: https://google.github.io/styleguide/lispguide.xml
44+
[vim]: https://google.github.io/styleguide/vimscriptguide.xml
4545
[cpplint]: https://github.com/google/styleguide/tree/gh-pages/cpplint
4646
[emacs]: https://raw.githubusercontent.com/google/styleguide/gh-pages/google-c-style.el
47-
[xml]: http://google.github.io/styleguide/xmlstyle.html
47+
[xml]: https://google.github.io/styleguide/xmlstyle.html

Diff for: ‎Rguide.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0"?>
2-
<html xmlns="http://www.w3.org/1999/xhtml">
2+
<html xmlns="https://www.w3.org/1999/xhtml">
33
<head>
44
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
55
<link rel="stylesheet" type="text/css" href="styleguide.css"/>
@@ -378,8 +378,8 @@ CalculateSampleCovariance &lt;- function(x, y, verbose = TRUE) {
378378
of the two systems, see Thomas Lumley's
379379
"Programmer's Niche: A Simple
380380
Class, in S3 and S4" in R News 4/1, 2004, pgs. 33 - 36:
381-
<a href="http://cran.r-project.org/doc/Rnews/Rnews_2004-1.pdf">
382-
http://cran.r-project.org/doc/Rnews/Rnews_2004-1.pdf</a>.)
381+
<a href="https://cran.r-project.org/doc/Rnews/Rnews_2004-1.pdf">
382+
https://cran.r-project.org/doc/Rnews/Rnews_2004-1.pdf</a>.)
383383
</p>
384384
<p>Use S3 objects and methods unless there is a strong reason to use
385385
S4 objects or methods. A primary justification for an S4 object

Diff for: ‎angularjs-google-style.html

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
2+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "https://www.w3.org/TR/REC-html40/strict.dtd">
33
<html>
44
<head>
55
<META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
@@ -21,24 +21,24 @@ <h1 class="external">An AngularJS Style Guide for Closure Users at Google</h1>
2121
(or not apply) these recommendations, as relevant to their own use cases.</p>
2222

2323
<p class="external">This document describes style for AngularJS apps in google3. This guide
24-
supplements and extends the <a href="http://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml">
24+
supplements and extends the <a href="https://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml">
2525
Google JavaScript Style Guide</a>.
2626
</p>
2727

2828
<p><b>Style Note</b>: Examples on the AngularJS external webpage, and many external apps, are
2929
written in a style that freely uses closures, favors functional inheritance, and does not often use
3030
<a class="external"
31-
href="http://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml?showone=JavaScript_Types#JavaScript_Types">
31+
href="https://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml?showone=JavaScript_Types#JavaScript_Types">
3232
JavaScript types</a>. Google follows a more rigorous Javascript style to support JSCompiler
3333
optimizations and large code bases - see the javascript-style mailing list.
3434
This is not an Angular-specific issue, and is not discussed further in this style guide.
3535
(But if you want further reading:
3636
<a href="http://martinfowler.com/bliki/Lambda.html">Martin Fowler on closures</a>,
3737
<a href="http://jibbering.com/faq/notes/closures/">much longer description</a>, appendix A of the
38-
<a href="http://books.google.com/books/about/Closure_The_Definitive_Guide.html?id=p7uyWPcVGZsC">
38+
<a href="https://books.google.com/books/about/Closure_The_Definitive_Guide.html?id=p7uyWPcVGZsC">
3939
closure book</a> has a good description of inheritance patterns and why it prefers
4040
pseudoclassical,
41-
<a href="http://books.google.com/books/about/JavaScript.html?id=PXa2bby0oQ0C">
41+
<a href="https://books.google.com/books/about/JavaScript.html?id=PXa2bby0oQ0C">
4242
Javascript, the Good Parts</a> as a counter.)</p>
4343

4444
<h5>1 Angular Language Rules</h5>
@@ -152,7 +152,7 @@ <h3 id="compilerflags">JSCompiler Flags</h3>
152152

153153
<h3 id="controllers">Controllers and Scopes</h3>
154154
<p>Controllers are classes. Methods should be defined on MyCtrl.prototype.
155-
See <a href="http://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml?showone=Method_and_property_definitions#Method_and_property_definitions">
155+
See <a href="https://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml?showone=Method_and_property_definitions#Method_and_property_definitions">
156156
the JavaScript style guide</a></p>
157157

158158
<p>Google Angular applications should use the <b>'controller as'</b> style to export the controller
@@ -343,8 +343,8 @@ <h3 id="testing">Testing</h3>
343343

344344
<p>Angular provides easy adapters to load modules and use the injector in Jasmine tests.
345345
<ul>
346-
<li><a href = "http://docs.angularjs.org/api/angular.mock.module">module</a>
347-
<li><a href="http://docs.angularjs.org/api/angular.mock.inject">inject</a>
346+
<li><a href = "https://docs.angularjs.org/api/angular.mock.module">module</a>
347+
<li><a href="https://docs.angularjs.org/api/angular.mock.inject">inject</a>
348348
</ul>
349349
</p>
350350

@@ -385,7 +385,7 @@ <h2 id="bestpractices">4 Best practices links and docs</h2>
385385
<ul>
386386
<li><a href="https://github.com/angular/angular.js/wiki/Best-Practices">
387387
Best Practices</a> from Angular on GitHub</li>
388-
<li><a href="http://www.youtube.com/watch?v=ZhfUv0spHCY">
388+
<li><a href="https://www.youtube.com/watch?v=ZhfUv0spHCY">
389389
Meetup video</a> (not Google specific)</li>
390390
</ul>
391391
<address>

Diff for: ‎cppguide.html

+21-21
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ <h4 class="stylepoint_subsection">Named Namespaces</h4>
617617

618618
<p>Namespaces wrap the entire source file after
619619
includes,
620-
<a href="http://gflags.github.io/gflags/">
620+
<a href="https://gflags.github.io/gflags/">
621621
gflags</a> definitions/declarations
622622
and forward declarations of classes from other namespaces.</p>
623623

@@ -1155,7 +1155,7 @@ <h3 id="Copyable_Movable_Types">Copyable and Movable Types</h3>
11551155
operations for them can be confusing, nonsensical, or outright
11561156
incorrect. Copy/assigment operations for base class types are
11571157
hazardous, because use of them can lead to
1158-
<a href="http://en.wikipedia.org/wiki/Object_slicing">object
1158+
<a href="https://en.wikipedia.org/wiki/Object_slicing">object
11591159
slicing</a>. Defaulted or carelessly-implemented copy operations
11601160
can be incorrect, and the resulting bugs can be confusing and
11611161
difficult to diagnose.</p>
@@ -1689,7 +1689,7 @@ <h3 id="Access_Control">Access Control</h3>
16891689
be <code>protected</code> when using
16901690

16911691

1692-
<a href="http://code.google.com/p/googletest/">Google
1692+
<a href="https://code.google.com/p/googletest/">Google
16931693
Test</a>).</p>
16941694
</div>
16951695

@@ -2715,7 +2715,7 @@ <h3 id="Streams">Streams</h3>
27152715
<li>The practice of building up output through chains
27162716
of <code>&lt;&lt;</code> operators interferes with
27172717
internationalization, because it bakes word order into the
2718-
code, and streams' support for localization is <a href="http://www.boost.org/doc/libs/1_48_0/libs/locale/doc/html/rationale.html#rationale_why">
2718+
code, and streams' support for localization is <a href="https://www.boost.org/doc/libs/1_48_0/libs/locale/doc/html/rationale.html#rationale_why">
27192719
flawed</a>.</li>
27202720

27212721

@@ -3763,7 +3763,7 @@ <h3 id="Boost">Boost</h3>
37633763

37643764
<div class="definition">
37653765
<p> The
3766-
<a href="http://www.boost.org/">
3766+
<a href="https://www.boost.org/">
37673767
Boost library collection</a> is a popular collection of
37683768
peer-reviewed, free, open-source C++ libraries.</p>
37693769
</div>
@@ -3793,53 +3793,53 @@ <h3 id="Boost">Boost</h3>
37933793

37943794
<ul>
37953795
<li>
3796-
<a href="http://www.boost.org/libs/utility/call_traits.htm">
3796+
<a href="https://www.boost.org/libs/utility/call_traits.htm">
37973797
Call Traits</a> from <code>boost/call_traits.hpp</code></li>
37983798

3799-
<li><a href="http://www.boost.org/libs/utility/compressed_pair.htm">
3799+
<li><a href="https://www.boost.org/libs/utility/compressed_pair.htm">
38003800
Compressed Pair</a> from <code>boost/compressed_pair.hpp</code></li>
38013801

3802-
<li><a href="http://www.boost.org/libs/graph/">
3802+
<li><a href="https://www.boost.org/libs/graph/">
38033803
The Boost Graph Library (BGL)</a> from <code>boost/graph</code>,
38043804
except serialization (<code>adj_list_serialize.hpp</code>) and
38053805
parallel/distributed algorithms and data structures
38063806
(<code>boost/graph/parallel/*</code> and
38073807
<code>boost/graph/distributed/*</code>).</li>
38083808

3809-
<li><a href="http://www.boost.org/libs/property_map/">
3809+
<li><a href="https://www.boost.org/libs/property_map/">
38103810
Property Map</a> from <code>boost/property_map</code>, except
38113811
parallel/distributed property maps (<code>boost/property_map/parallel/*</code>).</li>
38123812

3813-
<li><a href="http://www.boost.org/libs/iterator/">
3813+
<li><a href="https://www.boost.org/libs/iterator/">
38143814
Iterator</a> from <code>boost/iterator</code></li>
38153815

3816-
<li>The part of <a href="http://www.boost.org/libs/polygon/">
3816+
<li>The part of <a href="https://www.boost.org/libs/polygon/">
38173817
Polygon</a> that deals with Voronoi diagram
38183818
construction and doesn't depend on the rest of
38193819
Polygon:
38203820
<code>boost/polygon/voronoi_builder.hpp</code>,
38213821
<code>boost/polygon/voronoi_diagram.hpp</code>, and
38223822
<code>boost/polygon/voronoi_geometry_type.hpp</code></li>
38233823

3824-
<li><a href="http://www.boost.org/libs/bimap/">
3824+
<li><a href="https://www.boost.org/libs/bimap/">
38253825
Bimap</a> from <code>boost/bimap</code></li>
38263826

3827-
<li><a href="http://www.boost.org/libs/math/doc/html/dist.html">
3827+
<li><a href="https://www.boost.org/libs/math/doc/html/dist.html">
38283828
Statistical Distributions and Functions</a> from
38293829
<code>boost/math/distributions</code></li>
38303830

3831-
<li><a href="http://www.boost.org/libs/multi_index/">
3831+
<li><a href="https://www.boost.org/libs/multi_index/">
38323832
Multi-index</a> from <code>boost/multi_index</code></li>
38333833

3834-
<li><a href="http://www.boost.org/libs/heap/">
3834+
<li><a href="https://www.boost.org/libs/heap/">
38353835
Heap</a> from <code>boost/heap</code></li>
38363836

3837-
<li>The flat containers from <a href="http://www.boost.org/libs/container/">
3837+
<li>The flat containers from <a href="https://www.boost.org/libs/container/">
38383838
Container</a>:
38393839
<code>boost/container/flat_map</code>, and
38403840
<code>boost/container/flat_set</code></li>
38413841

3842-
<li><a href="http://www.boost.org/libs/intrusive/">
3842+
<li><a href="https://www.boost.org/libs/intrusive/">
38433843
Intrusive</a> from <code>boost/intrusive</code>.</li>
38443844
</ul>
38453845

@@ -3853,12 +3853,12 @@ <h3 id="Boost">Boost</h3>
38533853
standard libraries in C++11:</p>
38543854

38553855
<ul>
3856-
<li><a href="http://www.boost.org/libs/array/">
3856+
<li><a href="https://www.boost.org/libs/array/">
38573857
Array</a> from <code>boost/array.hpp</code>: use
38583858
<a href="http://en.cppreference.com/w/cpp/container/array">
38593859
<code>std::array</code></a> instead.</li>
38603860

3861-
<li><a href="http://www.boost.org/libs/ptr_container/">
3861+
<li><a href="https://www.boost.org/libs/ptr_container/">
38623862
Pointer Container</a> from <code>boost/ptr_container</code>: use containers of
38633863
<a href="http://en.cppreference.com/w/cpp/memory/unique_ptr">
38643864
<code>std::unique_ptr</code></a> instead.</li>
@@ -3910,7 +3910,7 @@ <h3 id="std_hash">std::hash</h3>
39103910
usually doesn't have, and shouldn't need. The stakes here are high
39113911
because low-quality hash functions can be security vulnerabilities,
39123912
due to the emergence of
3913-
<a href="http://emboss.github.io/blog/2012/12/14/breaking-murmur-hash-flooding-dos-reloaded/">
3913+
<a href="https://emboss.github.io/blog/2012/12/14/breaking-murmur-hash-flooding-dos-reloaded/">
39143914
hash flooding attacks</a>.</p>
39153915

39163916
<p>Even for experts, <code>std::hash</code> specializations are
@@ -3963,7 +3963,7 @@ <h3 id="C++11">C++11</h3>
39633963
<div class="stylebody">
39643964

39653965
<div class="definition">
3966-
<p> C++11 contains <a href="http://en.wikipedia.org/wiki/C%2B%2B11">
3966+
<p> C++11 contains <a href="https://en.wikipedia.org/wiki/C%2B%2B11">
39673967
significant changes</a> both to the language and
39683968
libraries. </p>
39693969
</div>

Diff for: ‎cpplint/README

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
This is automated checker to make sure a C++ file follows Google's C++ style
2-
guide (http://google.github.io/styleguide/cppguide.html). As it
2+
guide (https://google.github.io/styleguide/cppguide.html). As it
33
heavily relies on regular expressions, cpplint.py won't catch all violations of
44
the style guide and will very occasionally report a false positive. There is a
55
list of things we currently don't handle very well at the top of cpplint.py,

Diff for: ‎cpplint/cpplint.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<file> [file] ...
6161
6262
The style guidelines this tries to follow are those in
63-
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml
63+
https://google-styleguide.googlecode.com/svn/trunk/cppguide.xml
6464
6565
Every problem is given a confidence score from 1-5, with 5 meaning we are
6666
certain of the problem, and 1 meaning it could be a legitimate construct.
@@ -2844,7 +2844,7 @@ def CheckForFunctionLengths(filename, clean_lines, linenum,
28442844
"""Reports for long function bodies.
28452845
28462846
For an overview why this is done, see:
2847-
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Write_Short_Functions
2847+
https://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Write_Short_Functions
28482848
28492849
Uses a simplistic algorithm assuming other style guidelines
28502850
(especially spacing) are followed.
@@ -4912,7 +4912,7 @@ def CheckLanguage(filename, clean_lines, linenum, file_extension,
49124912
and line[-1] != '\\'):
49134913
error(filename, linenum, 'build/namespaces', 4,
49144914
'Do not use unnamed namespaces in header files. See '
4915-
'http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Namespaces'
4915+
'https://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Namespaces'
49164916
' for more information.')
49174917

49184918

Diff for: ‎cpplint/cpplint_unittest.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3794,7 +3794,7 @@ def testUnnamedNamespacesInHeaders(self):
37943794
self.TestLanguageRulesCheck(
37953795
'foo.h', 'namespace {',
37963796
'Do not use unnamed namespaces in header files. See'
3797-
' http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Namespaces'
3797+
' https://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Namespaces'
37983798
' for more information. [build/namespaces] [4]')
37993799
# namespace registration macros are OK.
38003800
self.TestLanguageRulesCheck('foo.h', 'namespace { \\', '')

Diff for: ‎docguide/best_practices.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Documentation Best Practices
22

33
"Say what you mean, simply and directly." - [Brian Kernighan]
4-
(http://en.wikipedia.org/wiki/The_Elements_of_Programming_Style)
4+
(https://en.wikipedia.org/wiki/The_Elements_of_Programming_Style)
55

66
Contents:
77

Diff for: ‎docguide/style.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -366,8 +366,8 @@ to read in source and most importantly, **a pain to modify later**.
366366
```markdown
367367
Fruit | Attribute | Notes
368368
--- | --- | --- | ---
369-
Apple | [Juicy](http://example.com/SomeReallyReallyReallyReallyReallyReallyReallyReallyLongQuery), Firm, Sweet | Apples keep doctors away.
370-
Banana | [Convenient](http://example.com/SomeDifferentReallyReallyReallyReallyReallyReallyReallyReallyLongQuery), Soft, Sweet | Contrary to popular belief, most apes prefer mangoes.
369+
Apple | [Juicy](https://example.com/SomeReallyReallyReallyReallyReallyReallyReallyReallyLongQuery), Firm, Sweet | Apples keep doctors away.
370+
Banana | [Convenient](https://example.com/SomeDifferentReallyReallyReallyReallyReallyReallyReallyReallyLongQuery), Soft, Sweet | Contrary to popular belief, most apes prefer mangoes.
371371

372372
DO NOT DO THIS
373373
```
@@ -380,15 +380,15 @@ in a slightly less compact, though much more edit-friendly way:
380380

381381
### Apple
382382

383-
* [Juicy](http://SomeReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyLongURL)
383+
* [Juicy](https://SomeReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyLongURL)
384384
* Firm
385385
* Sweet
386386

387387
Apples keep doctors away.
388388

389389
### Banana
390390

391-
* [Convenient](http://example.com/SomeDifferentReallyReallyReallyReallyReallyReallyReallyReallyLongQuery)
391+
* [Convenient](https://example.com/SomeDifferentReallyReallyReallyReallyReallyReallyReallyReallyLongQuery)
392392
* Soft
393393
* Sweet
394394

0 commit comments

Comments
 (0)