Fix #1874 -- fix documentation bugs

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Jul 9, 2015 · a75b228 · a75b228
1 parent 07331a6
commit a75b228
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -11,6 +11,7 @@ Features
 Bugfixes
 --------
 
+* Fix links in sample post (Issue #1874)
 * Don't use deprecated Yapsy methods (Isue #1868)
 * Surpress wincing when auto is aborted during rebuilding
 * Show tags only from the current language on tag listing pages (Issue #1856)

diff --git a/docs/manual.txt b/docs/manual.txt
@@ -36,7 +36,7 @@ Edit the post:
 Build the site:
      ``nikola build``
 
-Start the test server and open a browser (http://127.0.0.1:8000/):
+Start the test server and open a browser:
      ``nikola serve -b``
 
 
@@ -201,14 +201,14 @@ of how to "get" something for your specific operating system are left to you.
 
 The short version is::
 
-    pip install nikola
+    pip install Nikola
 
 Note that you need Python v2.7 or newer OR v3.3 or newer.
 
 Some features require **extra dependencies**.  You can install them all in bulk
 by doing::
 
-    pip install "nikola[extras]"
+    pip install "Nikola[extras]"
 
 Alternatively, you can install those packages one-by-one, when required (Nikola
 will tell you what packages are needed)

diff --git a/nikola/data/samplesite/README.txt b/nikola/data/samplesite/README.txt
@@ -2,18 +2,15 @@ This folder contains the source used to generate a static site using Nikola.
 
 Installation and documentation at https://getnikola.com/
 
-Configuration file for the site is `conf.py`.
+Configuration file for the site is ``conf.py``.
 
 To build the site::
 
     nikola build
 
 To see it::
 
-    nikola serve
-
-And point your browser to http://localhost:8000/
-
+    nikola serve -b
 
 To check all available commands::
 

diff --git a/nikola/data/samplesite/posts/1.rst b/nikola/data/samplesite/posts/1.rst
@@ -17,11 +17,11 @@ and build a site using it. Congratulations!
 
 Next steps:
 
-* `Read the manual </stories/handbook.html>`__
+* `Read the manual <link://slug/handbook>`__
 * `Visit the Nikola website to learn more <https://getnikola.com>`__
-* `See a demo photo gallery </galleries/demo/index.html>`__
-* `See a demo listing </stories/listings-demo.html>`__
-* `See a demo slideshow </stories/slides-demo.html>`__
-* `See a demo of the Bootstrap theme </stories/bootstrap-demo.html>`__
+* `See a demo photo gallery <link://gallery/demo>`__
+* `See a demo listing <link://slug/listings-demo>`__
+* `See a demo slideshow <link://slug/slides-demo>`__
+* `See a demo of the Bootstrap theme <link://slug/bootstrap-demo>`__
 
 Send feedback to info@getnikola.com!