Skip to contentSkip to conversation

docs: move website to its own sub-dir (branch yem/website)

PATCH New Yann E. MORIN 2 participants 5 messages Jan 23, 2015 – Jan 25, 2015

lore
Share & tools
lore

Yann E. MORIN

author
#0 lore raw

v2 cover docs: move website to its own sub-dir (branch yem/website)

Hello All!

This series moves the website to its own sub-dir, so it is not mixed with the rest of the documentation, especially the manual.

It will allow to reorganise the locations where we store manual-related configuration files, in my gendoc/asciidoc series.

The first patch can be applied right now, and is just a temporary kludge that has no impact, except makign the website available both in the current location, and the new one.

This means the website won't be impacted, and we can switch the deploy scripts to use the new location.

Once the scripts have been updated, the second patch does the actual move, and the website is only available from the new location.

Changes v1 -> v2:
- misc typoes in commit logs

Regards,
Yann E. MORIN.

The following changes since commit dfdf173a4c7ca1c8584833a7286df37cb008fdb2:

qt: add X11 support (2015-01-23 23:32:23 +0100)

are available in the git repository at:

git://git.busybox.net/~ymorin/git/buildroot yem/website

for you to fetch changes up to d6aafa8a13597213dceff4ba0da8e9f1194c317b:

docs: really move the website (2015-01-23 23:54:58 +0100)

----------------------------------------------------------------
Yann E. MORIN (2):
docs: prepare moving the website
docs: really move the website

 docs/images                                                |   1 +
 docs/{ => website}/about.html                              |   0
 docs/{ => website}/contribute.html                         |   0
 docs/{ => website}/copyright.txt                           |   0
 docs/{ => website}/css/bootstrap.min.css                   |   0
 docs/{ => website}/css/bootswatch.less                     |   0
 docs/{ => website}/css/buildroot.css                       |   0
 docs/{ => website}/css/variables.less                      |   0
 docs/{ => website}/docs.html                               |   0
 docs/{ => website}/download.html                           |   0
 docs/{ => website}/favicon.ico                             | Bin
 docs/{ => website}/fonts/glyphicons-halflings-regular.woff | Bin
 docs/{ => website}/footer.html                             |   0
 docs/{ => website}/git.html                                |   0
 docs/{ => website}/header.html                             |   0
 docs/{ => website}/images/boundary-devices-logo.png        | Bin
 docs/{ => website}/images/calao-logo.png                   | Bin
 docs/{ => website}/images/circuitco-logo.png               | Bin
 docs/{ => website}/images/fluendo-logo.png                 | Bin
 docs/{ => website}/images/free-electrons-logo.png          | Bin
 docs/{ => website}/images/glyphicons-halflings-white.png   | Bin
 docs/{ => website}/images/glyphicons-halflings.png         | Bin
 docs/{ => website}/images/google-logo.png                  | Bin
 docs/{ => website}/images/gplus.png                        | Bin
 docs/{ => website}/images/imgtec-logo.png                  | Bin
 docs/{ => website}/images/logo.png                         | Bin
 docs/{ => website}/images/logo.xcf                         | Bin
 docs/{ => website}/images/logo_small.png                   | Bin
 docs/{ => website}/images/menuconfig.png                   | Bin
 docs/{ => website}/images/menuconfig_small.png             | Bin
 docs/{ => website}/images/mind-logo.png                    | Bin
 docs/{ => website}/images/synopsys-logo.png                | Bin
 docs/{ => website}/images/valid-html401.png                | Bin
 docs/{ => website}/index.html                              |   0
 docs/{ => website}/js/bootstrap.min.js                     |   0
 docs/{ => website}/js/buildroot.js                         |   0
 docs/{ => website}/js/jquery-1.11.1.min.js                 |   0
 docs/{ => website}/news.html                               |   0
 docs/{ => website}/robots.txt                              |   0
 docs/{ => website}/sponsors.html                           |   0
 docs/{ => website}/support.html                            |   0
 41 files changed, 1 insertion(+)
 create mode 120000 docs/images
 rename docs/{ => website}/about.html (100%)
 rename docs/{ => website}/contribute.html (100%)
 rename docs/{ => website}/copyright.txt (100%)
 rename docs/{ => website}/css/bootstrap.min.css (100%)
 rename docs/{ => website}/css/bootswatch.less (100%)
 rename docs/{ => website}/css/buildroot.css (100%)
 rename docs/{ => website}/css/variables.less (100%)
 rename docs/{ => website}/docs.html (100%)
 rename docs/{ => website}/download.html (100%)
 rename docs/{ => website}/favicon.ico (100%)
 rename docs/{ => website}/fonts/glyphicons-halflings-regular.woff (100%)
 rename docs/{ => website}/footer.html (100%)
 rename docs/{ => website}/git.html (100%)
 rename docs/{ => website}/header.html (100%)
 rename docs/{ => website}/images/boundary-devices-logo.png (100%)
 rename docs/{ => website}/images/calao-logo.png (100%)
 rename docs/{ => website}/images/circuitco-logo.png (100%)
 rename docs/{ => website}/images/fluendo-logo.png (100%)
 rename docs/{ => website}/images/free-electrons-logo.png (100%)
 rename docs/{ => website}/images/glyphicons-halflings-white.png (100%)
 rename docs/{ => website}/images/glyphicons-halflings.png (100%)
 rename docs/{ => website}/images/google-logo.png (100%)
 rename docs/{ => website}/images/gplus.png (100%)
 rename docs/{ => website}/images/imgtec-logo.png (100%)
 rename docs/{ => website}/images/logo.png (100%)
 rename docs/{ => website}/images/logo.xcf (100%)
 rename docs/{ => website}/images/logo_small.png (100%)
 rename docs/{ => website}/images/menuconfig.png (100%)
 rename docs/{ => website}/images/menuconfig_small.png (100%)
 rename docs/{ => website}/images/mind-logo.png (100%)
 rename docs/{ => website}/images/synopsys-logo.png (100%)
 rename docs/{ => website}/images/valid-html401.png (100%)
 rename docs/{ => website}/index.html (100%)
 rename docs/{ => website}/js/bootstrap.min.js (100%)
 rename docs/{ => website}/js/buildroot.js (100%)
 rename docs/{ => website}/js/jquery-1.11.1.min.js (100%)
 rename docs/{ => website}/news.html (100%)
 rename docs/{ => website}/robots.txt (100%)
 rename docs/{ => website}/sponsors.html (100%)
 rename docs/{ => website}/support.html (100%)
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
author
#1 lore raw

PATCH v2 1/2 docs: prepare moving the website

This commit just creates a symlink so the website is now accessible from both docs/ and docs/website/.

This allows us to have the website now officially in docs/website, while still keep backward compatibility with the current scripts that update the website. Once those scripts have been updated, we'll be able to truly move the website to docs/website/ for good.

All without any perceived downtime or missed updated on the website! :-)

After an idea from Peter.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Peter Korsgaard <[email protected]>
Acked-by Thomas De Schampheleire <[email protected]>

---
Changes v1 -> v2:
- fix typo in title (Thomas DP)

---
 docs/website | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 docs/website
docs/website new file +1 -0
new file mode 120000
index 0000000..945c9b4
@@ -0,0 +1 @@
+.
\ No newline at end of file
Signature · 1 line
1.9.1
Applied
#2 lore raw

PATCH v2 1/2 docs: prepare moving the website

Dear Yann E. MORIN,

Quoted 8 lines · Yann E. MORIN

This commit just creates a symlink so the website is now accessible from both docs/ and docs/website/.

This allows us to have the website now officially in docs/website, while still keep backward compatibility with the current scripts that update the website. Once those scripts have been updated, we'll be able to truly move the website to docs/website/ for good.

Quoted 7 lines

All without any perceived downtime or missed updated on the website! :-)

After an idea from Peter.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Peter Korsgaard <[email protected]>
Acked-by Thomas De Schampheleire <[email protected]>

Applied, thanks.

Let's wait for this commit to be picked up by the server, change the server configuration, and apply the second commit. Let me know when it is OK to apply the second commit in this series.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#3 lore raw

PATCH v2 2/2 docs: really move the website

In reply to Yann E. MORIN

Now that the automated scripts that deply our website have been updated, really move the website to its final location.

We still keep a symlink for the images, as they are used both for the website, and for the manual.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Peter Korsgaard <[email protected]>

---
Since we do not have much flexibility with the automated scripts, I preferred the images be stored in the website so it is easier to deploy.

---
 docs/images                                                |   1 +
 docs/website                                               |   1 -
 docs/{ => website}/about.html                              |   0
 docs/{ => website}/contribute.html                         |   0
 docs/{ => website}/copyright.txt                           |   0
 docs/{ => website}/css/bootstrap.min.css                   |   0
 docs/{ => website}/css/bootswatch.less                     |   0
 docs/{ => website}/css/buildroot.css                       |   0
 docs/{ => website}/css/variables.less                      |   0
 docs/{ => website}/docs.html                               |   0
 docs/{ => website}/download.html                           |   0
 docs/{ => website}/favicon.ico                             | Bin
 docs/{ => website}/fonts/glyphicons-halflings-regular.woff | Bin
 docs/{ => website}/footer.html                             |   0
 docs/{ => website}/git.html                                |   0
 docs/{ => website}/header.html                             |   0
 docs/{ => website}/images/boundary-devices-logo.png        | Bin
 docs/{ => website}/images/calao-logo.png                   | Bin
 docs/{ => website}/images/circuitco-logo.png               | Bin
 docs/{ => website}/images/fluendo-logo.png                 | Bin
 docs/{ => website}/images/free-electrons-logo.png          | Bin
 docs/{ => website}/images/glyphicons-halflings-white.png   | Bin
 docs/{ => website}/images/glyphicons-halflings.png         | Bin
 docs/{ => website}/images/google-logo.png                  | Bin
 docs/{ => website}/images/gplus.png                        | Bin
 docs/{ => website}/images/imgtec-logo.png                  | Bin
 docs/{ => website}/images/logo.png                         | Bin
 docs/{ => website}/images/logo.xcf                         | Bin
 docs/{ => website}/images/logo_small.png                   | Bin
 docs/{ => website}/images/menuconfig.png                   | Bin
 docs/{ => website}/images/menuconfig_small.png             | Bin
 docs/{ => website}/images/mind-logo.png                    | Bin
 docs/{ => website}/images/synopsys-logo.png                | Bin
 docs/{ => website}/images/valid-html401.png                | Bin
 docs/{ => website}/index.html                              |   0
 docs/{ => website}/js/bootstrap.min.js                     |   0
 docs/{ => website}/js/buildroot.js                         |   0
 docs/{ => website}/js/jquery-1.11.1.min.js                 |   0
 docs/{ => website}/news.html                               |   0
 docs/{ => website}/robots.txt                              |   0
 docs/{ => website}/sponsors.html                           |   0
 docs/{ => website}/support.html                            |   0
 42 files changed, 1 insertion(+), 1 deletion(-)
 create mode 120000 docs/images
 delete mode 120000 docs/website
 rename docs/{ => website}/about.html (100%)
 rename docs/{ => website}/contribute.html (100%)
 rename docs/{ => website}/copyright.txt (100%)
 rename docs/{ => website}/css/bootstrap.min.css (100%)
 rename docs/{ => website}/css/bootswatch.less (100%)
 rename docs/{ => website}/css/buildroot.css (100%)
 rename docs/{ => website}/css/variables.less (100%)
 rename docs/{ => website}/docs.html (100%)
 rename docs/{ => website}/download.html (100%)
 rename docs/{ => website}/favicon.ico (100%)
 rename docs/{ => website}/fonts/glyphicons-halflings-regular.woff (100%)
 rename docs/{ => website}/footer.html (100%)
 rename docs/{ => website}/git.html (100%)
 rename docs/{ => website}/header.html (100%)
 rename docs/{ => website}/images/boundary-devices-logo.png (100%)
 rename docs/{ => website}/images/calao-logo.png (100%)
 rename docs/{ => website}/images/circuitco-logo.png (100%)
 rename docs/{ => website}/images/fluendo-logo.png (100%)
 rename docs/{ => website}/images/free-electrons-logo.png (100%)
 rename docs/{ => website}/images/glyphicons-halflings-white.png (100%)
 rename docs/{ => website}/images/glyphicons-halflings.png (100%)
 rename docs/{ => website}/images/google-logo.png (100%)
 rename docs/{ => website}/images/gplus.png (100%)
 rename docs/{ => website}/images/imgtec-logo.png (100%)
 rename docs/{ => website}/images/logo.png (100%)
 rename docs/{ => website}/images/logo.xcf (100%)
 rename docs/{ => website}/images/logo_small.png (100%)
 rename docs/{ => website}/images/menuconfig.png (100%)
 rename docs/{ => website}/images/menuconfig_small.png (100%)
 rename docs/{ => website}/images/mind-logo.png (100%)
 rename docs/{ => website}/images/synopsys-logo.png (100%)
 rename docs/{ => website}/images/valid-html401.png (100%)
 rename docs/{ => website}/index.html (100%)
 rename docs/{ => website}/js/bootstrap.min.js (100%)
 rename docs/{ => website}/js/buildroot.js (100%)
 rename docs/{ => website}/js/jquery-1.11.1.min.js (100%)
 rename docs/{ => website}/news.html (100%)
 rename docs/{ => website}/robots.txt (100%)
 rename docs/{ => website}/sponsors.html (100%)
 rename docs/{ => website}/support.html (100%)
docs/images new file +1 -0
new file mode 120000
index 0000000..7356350
@@ -0,0 +1 @@
+website/images
\ No newline at end of file
docs/website deleted +0 -1
deleted file mode 120000
index 945c9b4..0000000
@@ -1 +0,0 @@
-.
\ No newline at end of file
docs/website/about.html renamed from docs/about.html +0 -0
similarity index 100%
rename from docs/about.html
rename to docs/website/about.html
docs/website/contribute.html renamed from docs/contribute.html +0 -0
similarity index 100%
rename from docs/contribute.html
rename to docs/website/contribute.html
docs/website/copyright.txt renamed from docs/copyright.txt +0 -0
similarity index 100%
rename from docs/copyright.txt
rename to docs/website/copyright.txt
docs/website/css/bootstrap.min.css renamed from docs/css/bootstrap.min.css +0 -0
similarity index 100%
rename from docs/css/bootstrap.min.css
rename to docs/website/css/bootstrap.min.css
docs/website/css/bootswatch.less renamed from docs/css/bootswatch.less +0 -0
similarity index 100%
rename from docs/css/bootswatch.less
rename to docs/website/css/bootswatch.less
docs/website/css/buildroot.css renamed from docs/css/buildroot.css +0 -0
similarity index 100%
rename from docs/css/buildroot.css
rename to docs/website/css/buildroot.css
docs/website/css/variables.less renamed from docs/css/variables.less +0 -0
similarity index 100%
rename from docs/css/variables.less
rename to docs/website/css/variables.less
docs/website/docs.html renamed from docs/docs.html +0 -0
similarity index 100%
rename from docs/docs.html
rename to docs/website/docs.html
docs/website/download.html renamed from docs/download.html +0 -0
similarity index 100%
rename from docs/download.html
rename to docs/website/download.html
docs/website/favicon.ico renamed from docs/favicon.ico +0 -0
similarity index 100%
rename from docs/favicon.ico
rename to docs/website/favicon.ico
docs/website/fonts/glyphicons-halflings-regular.woff renamed from docs/fonts/glyphicons-halflings-regular.woff +0 -0
similarity index 100%
rename from docs/fonts/glyphicons-halflings-regular.woff
rename to docs/website/fonts/glyphicons-halflings-regular.woff
docs/website/footer.html renamed from docs/footer.html +0 -0
similarity index 100%
rename from docs/footer.html
rename to docs/website/footer.html
docs/website/git.html renamed from docs/git.html +0 -0
similarity index 100%
rename from docs/git.html
rename to docs/website/git.html
docs/website/header.html renamed from docs/header.html +0 -0
similarity index 100%
rename from docs/header.html
rename to docs/website/header.html
docs/website/images/boundary-devices-logo.png renamed from docs/images/boundary-devices-logo.png +0 -0
similarity index 100%
rename from docs/images/boundary-devices-logo.png
rename to docs/website/images/boundary-devices-logo.png
docs/website/images/calao-logo.png renamed from docs/images/calao-logo.png +0 -0
similarity index 100%
rename from docs/images/calao-logo.png
rename to docs/website/images/calao-logo.png
docs/website/images/circuitco-logo.png renamed from docs/images/circuitco-logo.png +0 -0
similarity index 100%
rename from docs/images/circuitco-logo.png
rename to docs/website/images/circuitco-logo.png
docs/website/images/fluendo-logo.png renamed from docs/images/fluendo-logo.png +0 -0
similarity index 100%
rename from docs/images/fluendo-logo.png
rename to docs/website/images/fluendo-logo.png
docs/website/images/free-electrons-logo.png renamed from docs/images/free-electrons-logo.png +0 -0
similarity index 100%
rename from docs/images/free-electrons-logo.png
rename to docs/website/images/free-electrons-logo.png
docs/website/images/glyphicons-halflings-white.png renamed from docs/images/glyphicons-halflings-white.png +0 -0
similarity index 100%
rename from docs/images/glyphicons-halflings-white.png
rename to docs/website/images/glyphicons-halflings-white.png
docs/website/images/glyphicons-halflings.png renamed from docs/images/glyphicons-halflings.png +0 -0
similarity index 100%
rename from docs/images/glyphicons-halflings.png
rename to docs/website/images/glyphicons-halflings.png
docs/website/images/google-logo.png renamed from docs/images/google-logo.png +0 -0
similarity index 100%
rename from docs/images/google-logo.png
rename to docs/website/images/google-logo.png
docs/website/images/gplus.png renamed from docs/images/gplus.png +0 -0
similarity index 100%
rename from docs/images/gplus.png
rename to docs/website/images/gplus.png
docs/website/images/imgtec-logo.png renamed from docs/images/imgtec-logo.png +0 -0
similarity index 100%
rename from docs/images/imgtec-logo.png
rename to docs/website/images/imgtec-logo.png
docs/website/images/logo.png renamed from docs/images/logo.png +0 -0
similarity index 100%
rename from docs/images/logo.png
rename to docs/website/images/logo.png
docs/website/images/logo.xcf renamed from docs/images/logo.xcf +0 -0
similarity index 100%
rename from docs/images/logo.xcf
rename to docs/website/images/logo.xcf
docs/website/images/logo_small.png renamed from docs/images/logo_small.png +0 -0
similarity index 100%
rename from docs/images/logo_small.png
rename to docs/website/images/logo_small.png
docs/website/images/menuconfig.png renamed from docs/images/menuconfig.png +0 -0
similarity index 100%
rename from docs/images/menuconfig.png
rename to docs/website/images/menuconfig.png
docs/website/images/menuconfig_small.png renamed from docs/images/menuconfig_small.png +0 -0
similarity index 100%
rename from docs/images/menuconfig_small.png
rename to docs/website/images/menuconfig_small.png
docs/website/images/mind-logo.png renamed from docs/images/mind-logo.png +0 -0
similarity index 100%
rename from docs/images/mind-logo.png
rename to docs/website/images/mind-logo.png
docs/website/images/synopsys-logo.png renamed from docs/images/synopsys-logo.png +0 -0
similarity index 100%
rename from docs/images/synopsys-logo.png
rename to docs/website/images/synopsys-logo.png
docs/website/images/valid-html401.png renamed from docs/images/valid-html401.png +0 -0
similarity index 100%
rename from docs/images/valid-html401.png
rename to docs/website/images/valid-html401.png
docs/website/index.html renamed from docs/index.html +0 -0
similarity index 100%
rename from docs/index.html
rename to docs/website/index.html
docs/website/js/bootstrap.min.js renamed from docs/js/bootstrap.min.js +0 -0
similarity index 100%
rename from docs/js/bootstrap.min.js
rename to docs/website/js/bootstrap.min.js
docs/website/js/buildroot.js renamed from docs/js/buildroot.js +0 -0
similarity index 100%
rename from docs/js/buildroot.js
rename to docs/website/js/buildroot.js
docs/website/js/jquery-1.11.1.min.js renamed from docs/js/jquery-1.11.1.min.js +0 -0
similarity index 100%
rename from docs/js/jquery-1.11.1.min.js
rename to docs/website/js/jquery-1.11.1.min.js
docs/website/news.html renamed from docs/news.html +0 -0
similarity index 100%
rename from docs/news.html
rename to docs/website/news.html
docs/website/robots.txt renamed from docs/robots.txt +0 -0
similarity index 100%
rename from docs/robots.txt
rename to docs/website/robots.txt
docs/website/sponsors.html renamed from docs/sponsors.html +0 -0
similarity index 100%
rename from docs/sponsors.html
rename to docs/website/sponsors.html
docs/website/support.html renamed from docs/support.html +0 -0
similarity index 100%
rename from docs/support.html
rename to docs/website/support.html
Signature · 1 line
1.9.1
Applied
#4 lore raw

PATCH v2 2/2 docs: really move the website

Dear Yann E. MORIN,

Quoted 8 lines · Yann E. MORIN

Now that the automated scripts that deply our website have been updated, really move the website to its final location.

We still keep a symlink for the images, as they are used both for the website, and for the manual.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Peter Korsgaard <[email protected]>

Applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com